Show on the right screen. (Fixes bug 133411, apart from the leak.)

2004-02-04  Morten Welinder  <terra@gnome.org>

	* gtk/gtktoolbar.c (show_menu): Show on the right screen.  (Fixes
	bug 133411, apart from the leak.)

diff --git a/ChangeLog b/ChangeLog
index 1a936931e091ef8aa97d6a113fca3bfcce90f981..acc9cd291e0d3ae99bca46da7275f6fc1e9cf660 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-04  Morten Welinder  <terra@gnome.org>
+
+       * gtk/gtktoolbar.c (show_menu): Show on the right screen.  (Fixes
+       bug 133411, apart from the leak.)
+
 Tue Feb  3 13:39:27 2004  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkadjustment.c (gtk_adjustment_new): pass value in last

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1a936931e091ef8aa97d6a113fca3bfcce90f981..acc9cd291e0d3ae99bca46da7275f6fc1e9cf660 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-02-04  Morten Welinder  <terra@gnome.org>
+
+       * gtk/gtktoolbar.c (show_menu): Show on the right screen.  (Fixes
+       bug 133411, apart from the leak.)
+
 Tue Feb  3 13:39:27 2004  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkadjustment.c (gtk_adjustment_new): pass value in last

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1a936931e091ef8aa97d6a113fca3bfcce90f981..acc9cd291e0d3ae99bca46da7275f6fc1e9cf660 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2004-02-04  Morten Welinder  <terra@gnome.org>
+
+       * gtk/gtktoolbar.c (show_menu): Show on the right screen.  (Fixes
+       bug 133411, apart from the leak.)
+
 Tue Feb  3 13:39:27 2004  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkadjustment.c (gtk_adjustment_new): pass value in last

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1a936931e091ef8aa97d6a113fca3bfcce90f981..acc9cd291e0d3ae99bca46da7275f6fc1e9cf660 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-02-04  Morten Welinder  <terra@gnome.org>
+
+       * gtk/gtktoolbar.c (show_menu): Show on the right screen.  (Fixes
+       bug 133411, apart from the leak.)
+
 Tue Feb  3 13:39:27 2004  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkadjustment.c (gtk_adjustment_new): pass value in last

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1a936931e091ef8aa97d6a113fca3bfcce90f981..acc9cd291e0d3ae99bca46da7275f6fc1e9cf660 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-02-04  Morten Welinder  <terra@gnome.org>
+
+       * gtk/gtktoolbar.c (show_menu): Show on the right screen.  (Fixes
+       bug 133411, apart from the leak.)
+
 Tue Feb  3 13:39:27 2004  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkadjustment.c (gtk_adjustment_new): pass value in last

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 224cb361de30c474ada6f82db4dd94c288b2dc97..9a4a337c9e82581cca395a8eb6c05a6802fa946e 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -2465,12 +2465,15 @@ show_menu (GtkToolbar     *toolbar,
            }
        }
     }
-  
+
+  gtk_window_set_screen (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (priv->menu))),
+                        gtk_widget_get_screen (GTK_WIDGET (toolbar)));
   gtk_widget_show_all (GTK_WIDGET (priv->menu));
-  
-  gtk_menu_popup (GTK_MENU (priv->menu), NULL, NULL,
+
+  gtk_menu_popup (priv->menu, NULL, NULL,
                  menu_position_func, toolbar,
-                 event? event->button : 0, event? event->time : gtk_get_current_event_time());
+                 event? event->button : 0,
+                 event? event->time : gtk_get_current_event_time());
 }
 
 static void